Revision: bazaar--devel--1.4--patch-89
Archive: robert.collins@canonical.com--general
Creator: Robert Collins <robert.collins@canonical.com>
Date: Thu May 19 22:44:21 EST 2005
Standard-date: 2005-05-19 12:44:21 GMT
Modified-files: commands/diff.c commands/status.c
New-patches: Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-2
    Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-3
    Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-4
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-89
    thelove@canonical.com/bazaar--devo--1.4--patch-54
    thelove@canonical.com/bazaar--devo--1.4--patch-55
Summary: merge from thelove
Keywords: 

Patches applied:

 * Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-2
   Progress report on the same line as the message in baz diff

 * Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-3
   Print conflicts with " C  dir/file.c" instead of verbose message.

 * Matthieu.Moy@imag.fr--public/bazaar--messages--1.4--patch-4
   --conflicted option for status.

 * thelove@canonical.com/bazaar--devo--1.4--patch-54
   Output messages improvements

 * thelove@canonical.com/bazaar--devo--1.4--patch-55
   --conflicted option for status

